Add words for transform filter. Make 'makedoc..in' format section headers in generat...

diff --git a/Makefile.in b/Makefile.in
index 5db824248a858f4353a07472752a0f9ea8c50505..6a878c80389be61683e36558ede7b8c4be4ecf30 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,7 +104,7 @@ gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@
 gpsbabel-debug: $(OBJS)
        $(CC)  $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@
 
-Makefile: Makefile.in config.status
+Makefile: Makefile.in config.status xmldoc/makedoc.in
        CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status 
 
 gbversion.h: configure config.status

diff --git a/filter_vecs.c b/filter_vecs.c
index 8dee6d560a8fbe20e1919705f1cf2aa092086336..75e4a5e1c36cfe89e033a5ad13e4a2a7a901a7ff 100644 (file)
--- a/filter_vecs.c
+++ b/filter_vecs.c
@@ -115,7 +115,7 @@ fl_vecs_t filter_vec_list[] = {
        {
                &transform_vecs,
                "transform",
-               "Transformate waypoints into a route, tracks into routes, ..."
+               "Transform waypoints into a route, tracks into routes, ..."
        },
 #endif
         {

diff --git a/xmldoc/filters/options/transform-del.xml b/xmldoc/filters/options/transform-del.xml
new file mode 100644 (file)
index 0000000..f8b6dda
--- /dev/null
+++ b/xmldoc/filters/options/transform-del.xml
@@ -0,0 +1,12 @@
+<para>
+This option, when used in connction with the wpt, rte, or trk options, tells
+GPSBabel to delete the source data after conversion.  This is most useful if 
+you are trying to avoid duplicated data in the output.
+</para>
+<example id="transform_del">
+<title>Convert a GPX track to GPX waypoints, tossing the original track</title>
+<para>
+<screen format="linespecific">gpsbabel -i gpx -f blah.gpx -x transform,wpt,del \
+-o gpx -F converted.gpx</screen>
+</para>
+</example>

diff --git a/xmldoc/filters/options/transform-rte.xml b/xmldoc/filters/options/transform-rte.xml
new file mode 100644 (file)
index 0000000..4edd958
--- /dev/null
+++ b/xmldoc/filters/options/transform-rte.xml
@@ -0,0 +1,12 @@
+<para>
+This option selects the destination type of this filter to be routes.  Choose this when you want to convert tracks into waypoints routes.  A single route will be created in the sequence they appear in the input.
+</para>
+<example id="transform_to_rte">
+<title>Converting a pile of waypoints to a GPX route</title>
+<para>
+Say you you have a data file that came from CSV file that you want to convert  
+to a GPX route that can be loaded into Mapsource.  Use the following command:
+<screen format="linespecific">gpsbabel -i csv -f blah.txt -x transform,rte \
+-o gdb -F blah.gdb</screen>
+</para>
+</example>

diff --git a/xmldoc/filters/options/transform-trk.xml b/xmldoc/filters/options/transform-trk.xml
new file mode 100644 (file)
index 0000000..25652cf
--- /dev/null
+++ b/xmldoc/filters/options/transform-trk.xml
@@ -0,0 +1,14 @@
+<para>
+This option selects the destination type of this filter to be tracks.  
+Choose this when you want to create tracks from a list of waypoints or routes. 
+A single track will be created in the sequence they appear in the input.
+</para>
+<example id="transform_to_trk">
+<title>Converting a pile of waypoints to a GPX track</title>
+<para>
+Say you you have a data file that came from CSV file that you want to convert  
+to a GPX track that can be loaded into Mapsource.  Use the following command:
+<screen format="linespecific">gpsbabel -i csv -f blah.txt -x transform,trk \
+-o gdb -F blah.gdb</screen>
+</para>
+</example>

diff --git a/xmldoc/filters/options/transform-wpt.xml b/xmldoc/filters/options/transform-wpt.xml
new file mode 100644 (file)
index 0000000..982f84c
--- /dev/null
+++ b/xmldoc/filters/options/transform-wpt.xml
@@ -0,0 +1,12 @@
+<para>
+This option selects the destination type of this filter to be waypoints.  
+Choose this when you want to convert tracks or routes into waypoints.
+</para>
+<example id="transform_to_wpt">
+<title>Converting a track to a sequence of waypoints</title>
+<para>
+Say you you have a KML file that contains a track but you want to convert it to a CSV file that can contain only waypoints, perhaps to import into a spreadsheet.  Use the following command:
+<screen format="linespecific">gpsbabel -i kml -f blah.kml -x transform,wpt \
+-o csv -F blah.txt</screen>
+</para>
+</example>

diff --git a/xmldoc/makedoc.in b/xmldoc/makedoc.in
index cf3b354eaaaf2771c5b650f722b91004221d39d3..4a8b45b72599d68d09251ab54d19db2ad880f600 100755 (executable)
--- a/xmldoc/makedoc.in
+++ b/xmldoc/makedoc.in
@@ -11,7 +11,7 @@ sub expandrw {
 
    my $res = "";
    if ( ($read eq 'r') || ($write eq 'w')) {
-     $res .= "      <listitem>\n        <para>\n          ";
+     $res .= "      <listitem>\n        <para role=\"fmtcapsitem\">\n          ";
      if ( ($read eq 'r') && ($write eq 'w')) {
        $res .= "read and write $type";
      }
@@ -28,13 +28,13 @@ sub expandrw {
 
 sub expandoptions {
    my $opts = shift;
-   my $res = "  <para>\n    This format can...\n    <itemizedlist>\n";
+   my $res = "  <para role=\"fmtcapshdr\">\n    This format can...\n    <itemizedlist>\n";
    
    $res .= expandrw( substr($opts,0,1), substr($opts,1,1), 'waypoints' );
    $res .= expandrw( substr($opts,2,1), substr($opts,3,1), 'tracks' );
    $res .= expandrw( substr($opts,4,1), substr($opts,5,1), 'routes' );
  
-   $res .= "    </itemizedlist>\n  </para>\n";
+   $res .= "    </itemizedlist></para>\n";
 
    $res;  
 }